From: Jan D. Date: Sat, 2 Apr 2011 07:11:00 +0000 (+0200) Subject: * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or later. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4244 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ea09364268fe31a36f5ee8f1f0970fce4b7af11a;p=emacs.git * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or later. --- diff --git a/src/ChangeLog b/src/ChangeLog index 95485e1712a..6719a29cfbc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-02 Jan Djärv + + * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or + later (Bug#8403). + 2011-04-01 Stefan Monnier Add lexical binding. diff --git a/src/nsterm.m b/src/nsterm.m index 91f0cbba585..f783bbe025f 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -583,6 +583,8 @@ ns_menu_bar_should_be_hidden (void) static void ns_update_auto_hide_menu_bar (void) { +#ifdef NS_IMPL_COCOA +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 BLOCK_INPUT; NSTRACE (ns_update_auto_hide_menu_bar); @@ -615,6 +617,8 @@ ns_update_auto_hide_menu_bar (void) } UNBLOCK_INPUT; +#endif +#endif }